Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adapt galaxy URL for Galaxy NG #599

Merged
merged 2 commits into from
Oct 25, 2023

Conversation

l00ptr
Copy link
Contributor

@l00ptr l00ptr commented Oct 9, 2023

SUMMARY

simply reply to #591 to use the new Galaxy NG url

@l00ptr
Copy link
Contributor Author

l00ptr commented Oct 9, 2023

CI is broken, we should probably merge #600 and rebase before re-trying.

@l00ptr l00ptr force-pushed the fix-galaxy-namespace branch from 60e99d4 to 1d0702e Compare October 24, 2023 20:30
@hunleyd hunleyd merged commit 4043e36 into ansible-collections:main Oct 25, 2023
@patchback
Copy link

patchback bot commented Oct 25, 2023

Backport to stable-1: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply 4043e36 on top of patchback/backports/stable-1/4043e36994d9de95c0379608edba7346559d9269/pr-599

Backporting merged PR #599 into main

  1. Ensure you have a local repo clone of your fork. Unless you cloned it
    from the upstream, this would be your origin remote.
  2. Make sure you have an upstream repo added as a remote too. In these
    instructions you'll refer to it by the name upstream. If you don't
    have it, here's how you can add it:
    $ git remote add upstream https://github.com/ansible-collections/community.postgresql.git
  3. Ensure you have the latest copy of upstream and prepare a branch
    that will hold the backported code:
    $ git fetch upstream
    $ git checkout -b patchback/backports/stable-1/4043e36994d9de95c0379608edba7346559d9269/pr-599 upstream/stable-1
  4. Now, cherry-pick PR Adapt galaxy URL for Galaxy NG #599 contents into that branch:
    $ git cherry-pick -x 4043e36994d9de95c0379608edba7346559d9269
    If it'll yell at you with something like fatal: Commit 4043e36994d9de95c0379608edba7346559d9269 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 4043e36994d9de95c0379608edba7346559d9269
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Adapt galaxy URL for Galaxy NG #599 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/stable-1/4043e36994d9de95c0379608edba7346559d9269/pr-599
  7. Create a PR, ensure that the CI is green. If it's not — update it so that
    the tests and any other checks pass. This is it!
    Now relax and wait for the maintainers to process your pull request
    when they have some cycles to do reviews. Don't worry — they'll tell you if
    any improvements are necessary when the time comes!

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

@Andersson007
Copy link
Collaborator

@hunleyd that's why ^ i prefer to make not related changes in separate PRs.. @l00ptr probably didn't manually backport his PRs we asked for, so now we can't automatically backport the README change..

@Andersson007
Copy link
Collaborator

@l00ptr would be really great if you backport all your not backported PRs manually starting from the oldest. We now have merge conflicts in our PRs because of that and resp. can't use the patch back bot

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants